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

Change-Id: I4220b1964040affa39d8d748095a161b2512eccf