NSTools keys

Change-Id: Iaf60461027bcb6aa6858ae04499d0b48038973db