Merge "Bad Wi-Fi: Change strings to carrier specs" into nyc-dr1-dev