Implementation of Koush superuser (3/3)

Change-Id: Idc7716f54e3d7b090e2d0ee57c57c8f8ae2f3887