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

Change-Id: Ieab7dc958e4916eea54ad67d52cb20e008319083