Merge "Covers more corner cases on restricted network modes:" into nyc-dev
am: b10c777ceb

* commit 'b10c777cebf2a86605f850c4181f45dc67d2a9a6':
  Covers more corner cases on restricted network modes:

Change-Id: I8fd7ddb841e40f9e5697be2e5f2b109fcc71bf33
tree: d49fd339204bd83d9feb902c52251ea49404b6d7
  1. tests/