Merge cherrypicks of ['googleplex-android-review.googlesource.com/31140191'] into 25D4-release.

Change-Id: I021691f326538581619e10e72489b4e943ab0491