Merge "ART: Address comment in Idaca9fe129ddc91aab79c65b3d0ca86f057848de" am: 8ec1abdb am: d2d66a32 am: c0eb46bd Change-Id: Ie24c19ab53d9c658011006419a4149ad742fd419