Merge "Uninstall package after UserRestrictionsTest" into nyc-mr1-dev