Merge changes from topic "am-10d7afb6-3af4-4441-ba2b-ee79a6b00d71" into oc-dev am: 6351187daf
am: 373ee45500

Change-Id: I6ae3db612437546d9b556882b11d0fedf2cf9b8b