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

Change-Id: I90764cb354439211852c7d6c14f281a629f83a59