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

Change-Id: I936ed9f443e6abb3184561e5bf7914b2a7c6a2e2