Merge "[MS76] Remove NetworkTemplate hidden api dependencies in NPMS"