Merge branch 'tracing/function-return-tracer' into tracing/fastboot