Merge cherrypicks of ['googleplex-android-review.googlesource.com/26658207'] into 24Q2-release. Change-Id: I1cafa23e8cb3cd1b64b8d34f30374f1acf97e356