Merge changes from topic "am-15f0e0eb-de71-4249-a3d8-9d82b407446c" into oc-dev
am: ec611113a6

Change-Id: Idc9cfc5c9800cb389e49d1ca01b1930ab2a91771