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

Change-Id: Ibb7f296e1a1a5295b62c0a4333d0cd7f309f490b