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

Change-Id: I6de048e65fc404bc0b3f5598d000613d3f186b6a