Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
am: 057dc8466a

Change-Id: If66ff93e4f4caddd9ebe62f9409812d4ed480c9b