Change to nAa Kernel

Change-Id: Ia2118c263a76417e5e34eaf1392eb43659550eda