Merge "tracing: Clean up tb_fmt to not give faulty compile warning" into msm-3.0