Merge "Merge changes from topic 'am-0d5025fcdb3d4464bfbc38ce8dca75c8' into oc-dev-plus-aosp am: f8a0073e67" into oc-dr1-dev-plus-aosp