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

Change-Id: I36693ae43b94da7d67c5e3fbab053128c44978a2