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

Change-Id: Ie3a28bed63392bb3f413ccc6e04e3c27721f6b58