Merge "ART: disable 638-no-line-number after move to d8"