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

Change-Id: Id1b8515e9323731f7bacd55d850460f00fc2c651