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

Change-Id: I263809d2dbd84dc9b0ddd8d50ce08be0902192bf