DO NOT MERGE: add support for new sched tracepoint am: a53ec324bd
am: c95681cbef  -s ours

* commit 'c95681cbef900a8bc93efda271146e99bd432366':
  DO NOT MERGE: add support for new sched tracepoint