Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev am: bcf3392856
am: 0fe900767e

Change-Id: I3b62983c0c6eb2bbfbf74739e8d5703ddcd56303