Merge "Merge "[manual merge] Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp --ours" into udc-dev-plus-aosp am: b62da8d5" into udc-d1-dev-plus-aosp