Merge "Support demo mode and demo users" into oc-dr1-dev