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

Change-Id: I2705f435af3724834915649c216be5b9b5a9d125