Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev am: 9ede115c am: 43539011 am: 6aaa85d9 Change-Id: I18a0f5624fca0ff47e28c7a04849ec44fb2c9833