Change to nAa Kernel

Change-Id: Ib8169ea1f1940ded65551db1704b166692a18b32