Merge "[PT12] Factor some code into ProxyTracker."
am: f24b6c77a6

Change-Id: Ib92107f434576d8296ba74aab0d9abfe56cefa7c