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

Change-Id: I9082b5253c643c7141ef82f48668daf7d33b7d72