am a50a0e90: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE

* commit 'a50a0e90fdd748218b738b9c13393d65248dd2cd':
  Fix NPE when going from proxy to no proxy.
tree: 5fd40e981cbcfdb7b2917ae3215b4ad2d2b725ae
  1. core/
  2. services/