Merge "[MS51] Remove NetworkTemplate#buildTemplate* usages from SettingsLib"