am 090e8f5a: Merge "Don\'t clear Global Proxy on boot." into klp-dev am: 48bc6038c9

Original change: undetermined

Change-Id: Iff2199f4103274b2bd57167533c5efc26a96df9b