Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev