Merge "Use new API to build NetworkTemplate" into qt-dev am: 8ed50556f5
am: c94b3c4624

Change-Id: Id46851c0f6cdf1d52ed7ff765bd715d4c7b444d9