[kernelbranch]

Change-Id: I53de498a186b9b6399023980ee451fe24115f0c5