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

Change-Id: Ied8ff797f933f011de1edc62779e124a462b5574