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

Change-Id: I047139864b9368b6a4226b850cdc56d8b8821950