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

Change-Id: Id8d82c38c3141d741722e1665ee02907e4d7d650