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

Change-Id: If39f921d62ab4d1e72fd521fd6dfeb5c0cdea2fe