ART Fix

Change-Id: Id7caa2da3256c5c98a0ca54cdd017b28b95b8fdc