am 416a1c1a: am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1

* commit '416a1c1ada0ad553613eb439823a68d3f51b1579':
  Stop showing "No internet connection" when there is one.