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

Change-Id: I8dc3595496881531dd1f17c8318eb93cd8c835d4