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

Change-Id: I618380bb159e5f394fabcc9ff69bde6f2d0679d5