Switch to new Superuser

Change-Id: I893d390987fa73c0248c7fb8725beae40bf6d05c