Merge "ART: Fix off-by-two whitespace"