Merge "DO NOT MERGE: Repeatedly prompting when no internet connection" into nyc-dev am: 5f4074fa7f
am: 079cc557f2

* commit '079cc557f2ce4508a84ecbe0d0d38fdf390c4885':
  DO NOT MERGE: Repeatedly prompting when no internet connection

Change-Id: Ia5712664204d4b7ca7bbfc1213b6b918ee87b6b2
tree: 8ba1249d27b3c8b05f73f93f17418c161868e016
  1. service/
  2. tests/