Merge "Fall back to Wi-Fi data when SIM missing." into jb-dev