Merge "Fix NetworkTemplate generates non-metered carrier template"