Merge "Cleanup setGlobalProxy"
tree: f34acd59e686b577a60f604549df8d362029de21
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING