Merge "ART: Fix typo" am: b38187c7a9 am: 03cd3d719c
am: e22e2ecc49

Change-Id: Idd4892bdd8a4ee596772ac3d4c59c1976fa8f45a