ART: Refactor ClassJoin code am: 5dfbe7ae9e
am: ec2522d627

Change-Id: I9b2ce65d570626416b60300f3797ddd7d91d535c