Merge changes from topic "am-896be361-a4b1-43e7-b1d4-8f471894d3a2" into oc-dev
am: d5ea04a874

Change-Id: I98ee11d65d823cce2614058af3f7c8e89103a7c7