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