Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev am: 36fe919606 am: c9be10b85f
am: bc8cde1353

Change-Id: Ia58a9de6ddbf5f3f5ef28b96a43ef83bda26d80b