Change to nAa kernel

Change-Id: I9ca308f7c48a6d1ec753e680b963e7e83596d83b