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

Change-Id: Ic26c5d2dc64d3c53c9b5f12da7e4419336594ad6