Kernel patch: Fix merge derps

Change-Id: I666515de30fe6a5d48a67890325104168ac5b0d6