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

Change-Id: Ia3398b6672cd80155147298f34ae7651b224d4dd