Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c am: 24701167 am: 689cf0f8 Change-Id: I211002b40f5acf9f7ad0a44e4530019df72c3b7c