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

Change-Id: I1e643d5be6d7f791c3bbe3ba018e6ad6717e3ddb