Adjust ns create part

Change-Id: Iafb60fb2d96af5536a00b547994863b29760e9e6
Related-PROD: PROD-27534 (PROD:27534)
(cherry picked from commit 0044a4e7ea358d638b9167b30632f51157369182)
3 files changed