Merge changes from topic "am-c310f9b4-18a7-4504-8179-49be1ab1d4a7" into oc-mr1-dev
am: 6dc35f01c5

Change-Id: Icb002f59d5b2d795626aa69df37109cf0b9ef22a