Merge cherrypicks of ['googleplex-android-review.googlesource.com/39398848'] into 26Q2-release. Change-Id: Ie9058c091864d233607db18a45c82b6045ec6d7d