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

Change-Id: Idd669570c71b76a43aa1ca6b6b4ec0e29baf124b