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

Change-Id: I021b957565808d55675d2a853887aaaf38dc94be