Merge "Remove hidden API usage from ProxyTracker"