Fixed Derp

Change-Id: I4619d4077a5c43658a33ae930e799f7fc019bfd0
Fixed my damn Derp!

!!!Human stupidity is infinite!!!

Change-Id: I44dd4ee33f882c080c67500824740232cdc7c597
merge

Change-Id: Ibf7f07ba986544b52ac1149b32eeb894d43c3ec2
Merge remote-tracking branch 'slim/jb4.2'; commit 'HEAD' into HEAD