af613236a7 PR: Removing btrace dependency (#22438)