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

Change-Id: Ia2549336f237ed9c6d4eda97545fac1a621ef57b