kernel branch derp

Change-Id: I4ecb622c8a73ead5f87b8830807e2ad96c0a7822