Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 057dc8466a
am: 1fa5118618

Change-Id: Icf8db899a7e0f68082e6eaf61f3f1541d456d880