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

Change-Id: Ibfb12abb0cbe455191b03e1f7c921a16a530b33f