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

Change-Id: I0d41f50144bb308f53c38ee4fa6e6d760adcb79e