Merge "Add settings and reset operations for demo users" into oc-dr1-dev