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

Change-Id: I5e802d7914e9d35c34fb22834e86c5795b4ac22f