Merge \"ART: Add ATRACE section for collision check\"
am: 531e86c888

Change-Id: I94ca6977f13277cc813e78764a5ac472c4fa29e0