A lot of changes and kernel upgrade

Change-Id: I444c97af6972107e44326cd83e2dbacba381d958