Merge changes from topic "am-6ebe6f88-baa6-4992-847e-cbad0be1c6a5" into oc-dev
am: 339d408f56

Change-Id: Ia0754e9aaf153d9f34152a6431156fec95871fed