Merge changes from topic "am-27a78f24-5ceb-49a1-aac0-4ec9810eec09" into oc-dev am: fae68b5518
am: 52459bcaaf

Change-Id: Ib700e9af2a4ed2ad29e09d5979effc2ec1261f54