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

Change-Id: I4bbfe681f15d9e8afc0f6e34e1a1cd893f1365a4