Merge "Use old API to build NetworkTemplate" into qt-dev am: e5fdc968a0
am: fd80b569f9

Change-Id: I028536be6c63a9c0424d998e5dd6fe14bf75c71e