Merge changes from topic "am-5525892b4ae143f49ddb25efbc5582ff" into oc-dev am: 36fe9196 am: c9be10b8 am: bc8cde13 Change-Id: Ia58a9de6ddbf5f3f5ef28b96a43ef83bda26d80b