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

Change-Id: I541657f83b2593f0c5a37fbbed014ce2679b71c2