Merge cherrypicks of [16199731] into security-aosp-pi-release.

Change-Id: I35640df761833474baeddd7029317f26b0a2271b