Merge "DO NOT MERGE: Repeatedly prompting when no internet connection" into nyc-dev
tree: 53618e9eacdc27f03ec4a2c1cef72734efd36b21
  1. service/