Merge "ART: Remove obsolete comment." am: 661aa034f7
am: ac7b61e1d6

Change-Id: Ibd05e6f41db71d1cc793772a42a3fb1c016bcc02