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

Change-Id: Ieea3b5b1a344cfa8c2b1ffe6e6155b17cf00b9db