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

Change-Id: Iae1632372659849d2f61377d0b31d171c50491ab