Change to nAa Kernel

Change-Id: Ied86c244b52f5781325e46af241e433598f6af33