Merge "Fix the format of wifi_carrier_content string" am: 985b432fc0 am: 47ba3b400c
am: 9dffb28afd

Change-Id: I90004b044b4217ad0c102e9afde1f491826d6a4f