Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev
am: 075bcf73c8

Change-Id: I926986b532e52b423555f9fb6540ccfe50eee075