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