Merge "ART: Remove stale comment" am: 69661d1045
am: 1cc5f2547d

Change-Id: I53bf9b5aefa282c69788d7ba439f6c461233818a