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

Change-Id: I657e6e887be807f55d284914d6ac19fb18237d76