Avoid GetObjectsWithTags calls in ClassTrack am: e039297a3e am: c518ea60a4
am: 6345274e2d

Change-Id: I2def5aa67be26c93178986159763eb8125d0c8c6