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

Change-Id: I38e1ccdd0f8a38e6ccefb3417d2c2c0fe1d32108