Add support for NKJP

Change-Id: I264813c45b0ae8b5daed9d3c380ac33b6a7a54a1
8 files changed