Merge cherrypicks of ['googleplex-android-review.googlesource.com/31477692'] into security-aosp-tm-release.

Change-Id: I188af659963580d1b3a62f3364b31fcf852de347