Merge "Flush package restriction changes for a user." into nyc-dev