Merge "ART: Change boot image class update"