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: Ia43e54244f1d2f6522af5d2cb5840b8323a24b04
tree: 151ced2894eded94462cc5d1b16b6bd535acffd3
  1. service/
  2. tests/