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

Change-Id: I55cb5372134a99f37d6eacaad2532f0d3718b274