Merge changes from topic "am-f8d9284a-cfc8-4e4b-8915-eaac6542f6b5" into oc-dev
am: 42fb96810e

Change-Id: Iae376975d87e030148b258cfeec3ab583b9f68fc