Merge changes (ag/22410589) in ag/master branch to aosp/main branch. Change-Id: Id0a3f95bfa662940d840b9bd934bbdfe54b3c618 Merged-In: Ia399307ec4a5439d1c3322ce052d0dc1a8d158d8