Merge "DO NOT MERGE: Repeatedly prompting when no internet connection" into nyc-dev am: 5f4074fa7f am: 079cc557f2
am: 44fcb5acfb  -s ours

* commit '44fcb5acfb805ba334c96a4ac1a549195a0174e8':
  DO NOT MERGE: Repeatedly prompting when no internet connection

Change-Id: Ifd3e7f7de2d82565af8f45f51e3615d6d8120264
tree: 3dfe0c10bf49d811f22ba2b9fa62951df4938aa1
  1. service/
  2. tests/