Merge "DO NOT MERGE: Repeatedly prompting when no internet connection" into nyc-dev
tree: 07d89391f475e714d09d288e8d7929d5e044f475
  1. service/
  2. tests/