Merge "[MS05] Fix NetworkTemplate lint errors"