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

Change-Id: I6e2ed91e6b21f139f427c339074a8c302068296a