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

Change-Id: I945f34dbe539ca8637182e10bea26778308292d4