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

Change-Id: Ifbc4526d1c0d3e7907b8aec7c9785e186e574917