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

Change-Id: Ib844542afa77aad9c3211651d223112e5a15f8b7