Merge pull request #17144 from leonazhao/v1.3t

Bug 937251 - [Cost Control] Remove proxy