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

Change-Id: If8958b177ed2f8a241b71caeeb1cb4d480b051a0