Merge branch 'tracing/fastboot' into tracing/ftrace