Using my bionic and superuser
Merge remote-tracking branch 'napodan/aosp' into njb4.2
Cleanup
Master revision for settings