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

Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3