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

Change-Id: I82697eebb557865b0a40ab667c6e9e30c50d91e9