Track Codefix SU

Need this commit to work on master
https://bitbucket.org/codefirex/superuser/commits/bc4c262a00145e239bcb2108d50c388f2ca984f8

Change-Id: I4e8bd160c4a962ce54bc438410831d08517cface