Merge "Use new API to build NetworkTemplate" into qt-dev
am: 8ed50556f5

Change-Id: I15991e56a97133b2e18ed20d6fc8171ad7eed5d2