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

Change-Id: Ia332ea53b0f50bba13caa4e1e86f1d13e67e8121