Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dead0 am: 8121e6c162
am: c2fabb2f8e

Change-Id: Ie286d80440bfdb0de87e4f34a45acfdc99998bda