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

Change-Id: I9aa9be5d62060870b967e81a3e1148375d2a7d35