Merge "Repeatedly prompting when no internet connection"
tree: dda6da77deec2c73601842342b86490d180ec679
  1. service/
  2. tests/