am 568845a7: Merge "Fix some alt-network issues." into gingerbread

* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
tree: d3bb4f071df948699385f2d5bccb8e9035310707
  1. core/
  2. services/