Merge "Revert "Add Trace for phrase breaking"" into udc-dev