Change to nAa Kernel

Change-Id: I86239f277e6eef42705be92d308cb8c3ab36988d