Merge "Restore spelling to Wi-Fi. Bug: 5163232"