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

Change-Id: Iddfe96f1284901798025143ed9789056cc321075