Merge "Remove Wi-Fi requirement for e911"