Merge cherrypicks of ['googleplex-android-review.googlesource.com/39315647'] into 26Q2-release.

Change-Id: I191319a52125284a5e856f4c836b42ad0dd68193