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

Change-Id: I1a04ce7b9e6d465f933deb45cecb72fcd0f1c48e