Change to nAa Kernel

Change-Id: Id318ab71e53a0d4f4c11364271890b1fb9f98654