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

Change-Id: I0a80f18d46c9b8d8312cbddf7c4dd157766ab3e3