Merge "An API to check if running in a demo user" into nyc-mr1-dev