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

Change-Id: I38c35b61b3d50ac320c0aa036c4886c523e27a90