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

Change-Id: I528351af6ed11b2cd486f9fee42ad09b69cd8d56