Merge "ART: Clean-up d8 expections"
am: de4efa65db

Change-Id: Ieec677acd52e0ec88a622415708a7730b0299c04