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

Change-Id: Ic3bed4ae9bab164293fe89fca04ae6428a025dad