Merge changes from topic "am-d3c27d13-d325-408a-9bdf-c6897f13c40b" into oc-dev
am: 455ad55741

Change-Id: Ib55b38149931dd87af381349fc0279f989678cb5