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

Change-Id: I6736c0d8ed37fb8b4b1f49a93062aa181aba69b0