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

Change-Id: Ie89cee811d30143a5fc326ee2c2f676ef2c2460c