Merge pull request #6444 from mikeller/remove_telemetry_srxl