Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev
am: 8b047ec8a2

Change-Id: I0c6522feec4b1baccf3c2c8ffb0d79bdebedb9b2