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

Change-Id: I5418a2401f87151150e60ba0218841e2e2e7e0be