Merge cherrypicks of [15687155] into security-aosp-pi-release

Change-Id: I078d92d68c56eaf237f7081c6a55fad31ef748f7