Merge cherrypicks of [14132525, 14131687] into security-aosp-pi-release

Change-Id: I7fdee6fc12312023a70a9b0d691a748e5e8d31b8