Merge "x86 ART FI clean-up"