Merge "[automerger skipped] Merge "Remove dependency on kotlin-reflect" into rvc-dev am: 888919fce1 am: f61ff3be56 -s ours" into rvc-d1-dev-plus-aosp