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

Change-Id: Icb3bd2a1c81246ed1814b3c7f345c0db4fe40807