Merge "Make host network access optional." am: 021e773593
am: fb61164cad

* commit 'fb61164cad4d38ecaefc903f81f18a708c2afa62':
  Make host network access optional.