Avoid GetObjectsWithTags calls in ClassTrack am: e039297a3e
am: c518ea60a4

Change-Id: I77db539be3b51d157b1c7fbb2318fa3aa26220cf