[automerger skipped] Avoid GetObjectsWithTags calls in ClassTrack
am: ded96ac6cd  -s ours

Change-Id: I34835385876d1b2a458640554deed96df72708f3