Merge "Allow calling in demo mode" into nyc-mr1-dev