Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev