Change to nAa Kernel

Change-Id: I541a7fb1c07823aedacfbcb9979371642486df11