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

Change-Id: I755fce6991b650445d77bf76076c48bf976733f4