Merge "Revert "Add package to Proxy2Test""