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

Change-Id: I8a92812418bcad2d35f09cde015220bedbe4bdb0