Merge changes from topic "am-419f3086-5068-4c88-ba99-be1d6eaaa1da" into oc-dev am: 34863cb616
am: aaa84b94e1

Change-Id: Ibfe5cb2df38087dfee0e5fb330e8a0dc8f0364ff