Merge changes from topic "am-ceff0dba-1d2f-4f16-bb64-e9bab2bd11dc" into oc-dev
am: a8caa2f3bd

Change-Id: I5da414d9a73556aa40142dcc3309c7725bf940be