Merge "ART: Fix 710-invoke-custom failure"
am: 700ef3d1ad

Change-Id: I435704538b637c4ebb080972570be81239186bf0