* Fixed review comments and resolved all threads in MR.

Signed-off-by: Arul Kumaran <arulkumaran.devarajan@huawei.com>