Merge "ART: Clear any exception after resolution" am: 3a4f5f3393 am: b66526a39a
am: f457455e1d

Change-Id: If3b80150e2a2e8005460a60a8ff4cecdb79b57a9