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

Change-Id: I3db921a415371f74855eb4a7cf948d33efd3ce0b