Merge "Don't allow restricted data usage of system" into nyc-dev