SuperUser

Change-Id: I3a1f31f0ba730cefee8cac7f787c17d01c85d7e1
Merge remote-tracking branch 'upstream/jb43' into jb43