Merge "Log content provider authority name in traces" into sc-dev