kernel branch

Change-Id: I7a7add6a723b6d193fc063817cd623196086f576