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

Change-Id: I014ebeae4f4201cc3d721f16caa1936018c44289