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

Change-Id: Ibb69521f75e2e0472d38674fc18c3df473caa233