Merge changes from topic "am-e418eebc66a1495eb35721b4c8f9d5ac" into oc-dev am: ed520eba4f
am: 7cef186f2c

Change-Id: I5eaff4482009fea9edd66d311ba5d3afbd1b5b3c