SuperUser fixes

Change-Id: I883e28592571751a067b6340f004b42ab7e2fbeb