am b4e4eca9: am c4bd0e6a: Merge "Workaround for network issues: use 127.0.0.1."

* commit 'b4e4eca98fa5692a31f1eed07ad3ac3f29ba4590':
  Workaround for network issues: use 127.0.0.1.