
Patch 1: Worked on Bart and Mary's comments.
Patch 2: Worked on Bart's comments.
Fix merge errors.
Signed-off-by: egoncalv <elisamaraaoki.goncalves@windriver.com>
Change-Id: Ida78101e923dbce32a1c17ba45becb4b62f17c4d
(cherry picked from commit cd1f0e68ff
)
Signed-off-by: Ron Stone <ronald.stone@windriver.com>