Merge "Fix network name for Passpoint network"