Use local Settings and extras

Change-Id: Ifb101f387000a7a85bbdb98bf9826216edc93ef6
Add Superuser

Change-Id: I535e02677c6476800cf86df3cf8d0203ca2b4e5c