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

Change-Id: I3a29bf9cd41d3c908888672db48e58a1d4f413ef