Do not return stale subtypes

Bug: 6294329
Change-Id: I3f0713f94c291298dfd447d1b65bd7c6d2858492
1 file changed