Merge "Use old API to build NetworkTemplate" into qt-dev am: e5fdc968a0 am: 68178f853b
am: 05afaeead6

Change-Id: I590bea15ee77d85c682580e16405c96b060ecdcc