Fix derp

Change-Id: I472c26413ef314d32c0427db42af9f1b68506d85
Merge "Fix derp" into jb4.2