Merge "Change bang to x for indication of no internet" into nyc-dr1-dev am:...
Merge "Change bang to x for indication of no internet" into nyc-dr1-dev am: 72ed4c37 am: 66184283 am: 2c74e4f7
am: 798266c0
Change-Id: Id3c83d792ddf4ecfd9fe83b1f1c1613a58dd448e