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

Change-Id: Idbb328211a573fba49e7ff344305a55d528cee36