Update kernel branch

Change-Id: Iae2ef6f3c7bdee1038dfb677eb192c3927d18e04