Merge "Removed dead code in DcTracker" am: a0b9309ba2
am: 5ae46260e4

Change-Id: Ib664690a19a00c6739fd0bff87e343742832478e