Update to NAE kernel source.
Merge NAE kernel source.