Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98 am: 9971303508 am: 28a2b521cf
am: 92295f0953

Change-Id: I1ef9422507de2aa9ee29ec3c52b17f3bf7363a06