Change to nAa Kernel

Change-Id: I65c01d2ab87a7f75abe2f28ff3c7eeb090ab44f8