Merge "Clean up keymint service policy."