Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861
am: 812ec62a14

Change-Id: I66ce801571d91b5e3791a57cebfe9b56715515b7