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

Change-Id: I27c7213c4d42a99543825a2f66785df2b97d8f01