Fixes

Change-Id: I6a720c9537604136a51af154dac53015d5a836e7
New kernel

Change-Id: I4d93d2a439c69d219fcf0b5fb7c2cf5583b9a919