Merge "Fix a boot failure due to Wifi / Wifi Passpoint"