Merge cherrypicks of ['googleplex-android-review.googlesource.com/26109848'] into 24Q1-release. Change-Id: I825d7f330bbd7b66ba8b5b75857e7e5e7c18c60b