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

Change-Id: I86b6ff05cf12d9d65720af605ea3cca334bdee1a