Merge "Setup user restrictions for demo user" into nyc-mr1-dev