Merge "ART: Fix incorrect dispatch"
am: eb53b68833

Change-Id: Iaab770edc00f67dce335077d6a52019032fd47fa