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

Change-Id: I8053a79146621f4e9f29fee42ebb7b6d247356ed