Merge "Restore the null behavior of buildWifiTemplate"