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

Change-Id: Ib92107f434576d8296ba74aab0d9abfe56cefa7c
tree: 3c46f0ef8fa6e071159c27c184e336b46d5b210a
  1. core/
  2. services/
  3. tests/