I can't find where outdated class is used

Change-Id: I1290359eee885dcca5e89e900eab09cfd3cf359a
Merge "I can't find where outdated class is used"