Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev am: 3bbe3c7c93 am: 24701167ba am: 689cf0f8a2
am: 995c542d0c

Change-Id: I267178d0ab2cf05abdc5d685e139f05cbcc427ca