Koush Superuser 2

Change-Id: Ib9f0fcb15662c1fac3f455da179b8c8ff9d3c18e