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

Change-Id: I7b3aae902eebd27590e4799408e941ee7761b834