ART: Add interface class join heuristic am: b5204f4216 am: 834f1e89d5
am: 64d6f1640c

Change-Id: I44dacd686ecd7ac6fcaf7057060ce9ebdb957418