Fix Derp

Change-Id: I052a0f15c9378eef98b33c146a29b6b43dc6c591
Merge "Fix Derp" into jb4.2