Merge "Change bang to x for indication of no internet" into nyc-dr1-dev am: 72ed4c3735 am: 6618428306 am: 2c74e4f719
am: 798266c0fc

Change-Id: Id3c83d792ddf4ecfd9fe83b1f1c1613a58dd448e