Change to nAa Kernel

Change-Id: Id0ce7a581c1502fd8eea1ddea12eb62230868348