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

Change-Id: Ie60eacb1ae2b393bdb3325d8d986f9594080d4f1