Merge "ART: Address comment in Idaca9fe129ddc91aab79c65b3d0ca86f057848de" am: 8ec1abdbcc
am: d2d66a32b4

Change-Id: I6dedbe0d08c95fb39e507e0c74219ce6f5985d01