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

Change-Id: I36b13e9046c99e7cea7932751a2d6b589b079b61