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

Change-Id: I9397ef4575f8816da764eabf1e58e33dfa80c4af