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

* commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8':
  Fix NPE when going from proxy to no proxy.