Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 7f8a269a3a
am: b0acf3e230

Change-Id: Ic986b24afbc15490f7d0faea8c7f23a979fdea4d