Merge "Add systrace events." into lmp-mr1-ub-dev