Merge "ART: Fix incorrect dispatch"
am: 7ee67be053

Change-Id: Ia6ed4af9cbcada5e355f1f0e62a9d12279e8fb22