Merge changes from topic "am-5e016a82-82c7-4e13-a46c-ba442963d59a" into oc-dev am: c985373782
am: 9ee9810dae

Change-Id: I295f95d4e1ac94f0eb9f8521a5e312385cb91f71