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

Change-Id: I5d45280b4fe4b5b4a929c663055847f61e2fdcb1