Merge "[PT10] Move loadGlobalProxy into ProxyTracker." am: 79822ffb6f am: a44b5f98a9
am: 8f04e8bc32

Change-Id: I593f1987170b279d57e8d18c380c1f16855f9206