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

Change-Id: Ibc7808be522d76ad6d596727211877ed2910a1cd