Fix client tracking

Bug: 8311559
Change-Id: I167fcdd5c3da4d46b7d99e18041036023c8c60f7
3 files changed