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

Change-Id: I2ef54d630b53452909a8e0ce007cbd163f405502