Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev
am: d349bd741d

Change-Id: If41945b25a473afa1c870e294a4b42e856e5c42c