Merge cherrypicks of ['googleplex-android-review.googlesource.com/28600455', 'googleplex-android-review.googlesource.com/28600456', 'googleplex-android-review.googlesource.com/28600458'] into 24Q3-release.

Change-Id: I24e42a4830ce637feed658ee4114eb70adc6e0d2