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

Change-Id: Ie7e189451040f149cd3c1d60414cd9bfadb3bf63