Make Superuser work.

Change-Id: Ib4d452094753458276f577dfc36b936c6888bcc0