Merge "Disallowing bluetooth config for demo users" into nyc-mr1-dev