suÃper derp

Change-Id: I1d6481705e3649296c7c8ac39eef182299e7d61e
Merge remote-tracking branch 'settingsPA/jb43-legacy' into jb43-legacy