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

Change-Id: Ic2236ac466bd86e019b7c004e9498493e16b96b7