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

Change-Id: If155443e20e34c570ae5ab4c90e615cf4adb4352