Merge "Disable debug logging" into tm-dev