Merge "Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 2189999c61" into oc-mr1-dev-plus-aosp