FlyKernel 2.3.1

Change-Id: I9627f07c4ff3315254a0aae1aa527e083fcb6964