kernel branch

Change-Id: I88b46a41224282d04a25d175111dc8bdb5091458