Merge "Re-enable NS primitives"
drwxr-xr-x - Release1
drwxr-xr-x - Release2
drwxr-xr-x - Release5
drwxr-xr-x - Release7