
Incorporated patchset 1 review comments
Updated patchset 5 review comments
Updated patchset 6 review comments
Fixed merge conflicts
Updated patchset 8 review comments
Fixed merge conflicts for this cherry pick.
Change-Id: Icd7b08ab69273f6073b960a13cf59905532f851a
Signed-off-by: Juanita-Balaraj <juanita.balaraj@windriver.com>
(cherry picked from commit 63cd4f5fdc
)
Signed-off-by: Juanita-Balaraj <juanita.balaraj@windriver.com>