Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
am: 528be61eeb

Change-Id: I8ee97a35c41ef54dde584ddd61b2afea577a9ad3