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

Change-Id: I704ec86a75c71169a04debddc95e84a8fd199272