FlyKernel v2.1

Change-Id: If407aed08f51c512fee835694858fc4da0c2a20e