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

Change-Id: I3ddf804a3f3ef4a180a71baa3e6761687362fd15