Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev
am: 231719b4d2

Change-Id: I5186692869d8849e0abc8d60f97970ce07e273aa