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

Change-Id: I02edc8a40ae34d0f73f50899ced53aa663f5d172