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

Change-Id: Ie5b177724fd43041dbe6c7fcf4d74e14f9887d44