Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev am: 3fa917c8bc
am: 51ec5967af

Change-Id: If8018f95a4a1ce3431d5fd28979056cd5e0f6535