Merge "base: remove onBind and onMessage from TraceReport API surface"