Merge "Add back @hide NetworkTemplate methods"