Merge "policy-hal: squash multiple changes/fixes to custom policy"