Change to nAa Kernel

Change-Id: I396f1e3ecff498425f9a7d8700ff8a8e45a747fc