Stock kernel for now

Change-Id: I6336691af00da1813976cb831ce20556e736b42c