Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev am: c70d882667 am: c262f7a96a
am: ac40bb76a1

Change-Id: Idecbdcc5616a974fe75d99667ec4a5e8d37d97c5