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

Change-Id: Iaa3595ea9be48a9f161a955b5087f4f22a69cec0