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

Change-Id: I3fcf42d184015e52d064baf6efdd38150fbc2b9b