Merge "[PT13] Simple cleanup of ProxyTracker."
am: afa7fdabaa

Change-Id: I6a30f78e517716ca3ff14a3601374fddc65e4aec