Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev am: 4244190788 am: 61ea78238e am: 61581686b6 am: 8c5f02eddd
am: da0d82c216

Change-Id: Id24cc73a5d9b3e06afbf2e3eab4c018596308c10