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

Change-Id: I0ab98203ac5b6488ea82778ae2d375a5e870973d