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

Change-Id: Ib38362e5793569abe89c0a6dc6669470784fb454