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

Change-Id: If50613ea23d3ac6b7f082909edc3dc8d3f037dc7