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

Change-Id: I1d252cb9fd8b85080f5d06552f1787609fa15923