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

Change-Id: I9f1cef400799409fab93f2e29aac96bd2cd6e079