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

Change-Id: Ib4509788887df4c5c2ef017eb808a38dea0ae00b