Merge "Revert "Revert "Change bang to x for indication of no internet""" into nyc-mr1-dev am: b04790c8d4
am: e4257eba8f

Change-Id: Ib2156707453d44bb900b012bc8f775399409d51d