kernel branch

Change-Id: I9162d16fba0b762da6aa49156490f4f2dbf397d6