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

Change-Id: I25798e2a43ed487320bd408a154140392a72f9cb