Merge "Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: d9862a4d0c am: 154dceeb32 am: 3e524035b9 am: 2e7e0c7894"