Merge "Use old API to build NetworkTemplate" into qt-dev am: e5fdc968a0 am: fd80b569f9
am: 62e334fc0f

Change-Id: I09a693c0f48a33fc509d40e29d165709da646c89