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

Change-Id: I103e9c75610c791190702f706f8f3ec0671342a4