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

Change-Id: I3963377ff37606f3d45ee3b96df770e3b85d45fd