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

Change-Id: Ie1eecd52e31477bf7cac2fbe542f34be308ec5b6