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

Change-Id: I2a46f4d921e05902bd41e8a1defa8d1ceffc0735