Merge "Disabling account modification on demo users" into nyc-mr1-dev