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

Change-Id: Ie695b5f8958180c3ec9424ced2659792d944437a