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