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

Change-Id: If92c1e8dce2bd88bb1ceb3a35f069414d1c5433c