Merge "ART: Address comment in Idaca9fe129ddc91aab79c65b3d0ca86f057848de"