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

Change-Id: I44cb403fb095486f4f7692b66213536f89df9ab3