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

Change-Id: I1fab24f62ad0ea218fb4689b4bba19481ac1101d