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

* commit '5f4074fa7f8e61d27cd24c317a0a1b8a5ece4724':
  DO NOT MERGE: Repeatedly prompting when no internet connection

Change-Id: I1360e20bc35bb91197bd8937c2296df3ae0912d8
tree: c75d7cb72bdfb09aee9add731a3c7397bc0622f7
  1. service/
  2. tests/