Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
tree: ce2862a2a0904d5be1472192d2c73897911158f1
  1. core/
  2. services/