NS and API changes

Change-Id: Iad5825d896e2b1dbb060bfbe84d024f353dfda39