Merge changes from topic "am-d9c6be77-633d-4f98-8eb7-b9106af9ba0f" into oc-dev am: 99cc6cb2a1
am: c3f0a8e200

Change-Id: Ia23c96b2880f13df80c3955c5acb0822bb6f2dd9