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

Change-Id: I042e148860e5bafcbd48d3781540ba0b555c2664