Merge cherrypicks of ['android-review.googlesource.com/3165099'] into 24Q3-release.

Change-Id: I3ce2332144c14523f8dda3ca138ec0aa99ebf6f4