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

Change-Id: Ibc2a210f92ee4e26f29df4c124be58e0134cdef6