Merge "Clean up zen rules and permissions immediately on uninstall." into...
Merge "Clean up zen rules and permissions immediately on uninstall." into nyc-mr1-dev am: 6715c6ab am: f5c03021
am: ba86a74f
Change-Id: I47a2bcfeaee47a59c22496985796e1d82210a6c2