Merge "Remove legacy unused proto tracing code to prevent confusion" into udc-qpr-dev