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

Change-Id: I25c866ebe559df2c3a4eab38ff22d456f89471c0