Merge "[automerger skipped] Backporting the change of ag/15629060 to pi-dev am: 95ff59db3b am: e317818b24 am: 8f758cff77 am: 30d1571a99 am: 5b9145dd18 am: f155d65dba am: a9594d44d0 -s ours am: 51aec9b6ad -s ours" into sc-v2-dev-plus-aosp