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

Change-Id: I315b894df15d7fd3dd1f74fdf323f07633981cd3