Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev am: 3266dbabf9
am: 073a48b27d

Change-Id: I298dbc1500895ff6d3802008ad636f74482e2fd3