Temp fix for SuperUser

Change-Id: I46f0417e7996aa3e7dc6d81eee987228bdcbfa24