Merge "Remove path prefix with $ERROR_LOG"