Merge changes from topic "am-1ab9514f-fd12-4093-b1cb-a77e9f0419c9" into oc-dev
am: 46fc48f57e

Change-Id: I85ba0993926fbd9a61525e35e411887130b3c5aa