Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev
am: c844ea5c96

Change-Id: Iccd345fb289c4daae404186709dccd4e8fb67fd1