Integrate Koush SU into Settings 2/2

Change-Id: Ie836ba41513cd7641e9f950434be80f01450f86a
Merge "Integrate Koush SU into Settings 2/2" into jb42