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

Change-Id: I47a2bcfeaee47a59c22496985796e1d82210a6c2