Merge branch 'tracing/mmiotrace-mergefixups' into tracing/mmiotrace