SuperUser fixes

Change-Id: I883e28592571751a067b6340f004b42ab7e2fbeb
(cherry picked from commit 2ea80ae805c4cff88f0faf6add601a2238dca9ce)